From: Ian Campbell <ian.campbell@xensource.com>
Date: Fri, 17 Aug 2007 15:34:11 +0000 (+0100)
Subject: silentoldconfig seems to break automated testing, try an explicit make prepare
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14987^2~67^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=47e2355fc9bb00b311fd64b01497fce16b6ca522;p=xen.git

silentoldconfig seems to break automated testing, try an explicit make prepare
instead.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
---

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 89b3f02709..25d258de4e 100644
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -98,12 +98,12 @@ endif
 ifneq ($(EXTRAVERSION),)
 	echo "$(EXTRAVERSION)" >$(LINUX_DIR)/localversion-xen
 endif
-	$(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) silentoldconfig O=$$(/bin/pwd)/$(LINUX_DIR)
+	$(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) oldconfig O=$$(/bin/pwd)/$(LINUX_DIR)
 	@if [ ! -f $(LINUX_DIR)/Makefile ] ; then \
-	    echo "*****************************************"; \
-	    echo "silentoldconfig did not create a Makefile"; \
+	    echo "***********************************"; \
+	    echo "oldconfig did not create a Makefile"; \
 	    echo "Generating $(LINUX_DIR)/Makefile   "; \
-	    echo "*****************************************"; \
+	    echo "***********************************"; \
 	    ( echo "# Automatically generated: don't edit"; \
 	      echo ""; \
 	      echo "VERSION = 2"; \
@@ -125,6 +125,7 @@ endif
 	      echo "	\$$(MAKE) -C \$$(KERNELSRC) O=\$$(KERNELOUTPUT) \$$@"; \
 	    ) > $(LINUX_DIR)/Makefile ; \
 	fi
+	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) prepare
 
 .PHONY: prep
 prep: $(LINUX_DIR)/include/linux/autoconf.h